* xfaces.c (merge_faces): You can't tell if a font is a

	character-cell font or not by testing whether or not it has a
	per_char table.  They all do.
	* xterm.c (x_new_font): Same deal.

diff --git a/src/xterm.c b/src/xterm.c
index 046cf5100a64a794a3bb7a81fe41a4445b213624..8f61d79d287bf828ff75cc2be9efea39ce2074a1 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3939,9 +3939,14 @@ x_new_font (f, fontname)
       XFontStruct *font;
 
       /* Try to find a character-cell font in the list.  */
+#if 0 
+      /* A laudable goal, but this isn't how to do it.  */
       for (i = 0; i < n_matching_fonts; i++)
        if (! font_info[i].per_char)
          break;
+#else
+      i = 0;
+#endif
 
       if (i >= n_matching_fonts)
        return 2;